Merge from erc--emacs--21
authorMiles Bader <miles@gnu.org>
Thu, 3 Aug 2006 05:10:38 +0000 (05:10 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 3 Aug 2006 05:10:38 +0000 (05:10 +0000)
commit2a7d88ecdeba2b84768c0660d5e5c04780a4a860
tree4ede20de29354352c91e321f81c3a07463fdbd66
parent7b65ba5e3d6df595e405e306c9a0197603a51db2
Merge from erc--emacs--21

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379
Creator:  Michael Olson <mwolson@gnu.org>
etc/ChangeLog
etc/ERC-NEWS
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/erc/erc-log.el
lisp/erc/erc-spelling.el
lisp/erc/erc.el
man/ChangeLog
man/erc.texi